Simplify Makefiles. <URL: http://bugzilla.gnome.org/show_bug.cgi?id=68969>

Simplify Makefiles.
<URL: http://bugzilla.gnome.org/show_bug.cgi?id=68969>
* gdk/Makefile.am: Remove use of automake conditionals to pick
library to build.
* gtk/Makefile.am: Likewise.

* gdk/Makefile.am (LDFLAGS): Use $(libdir), not @prefix@/lib.
* gtk/Makefile.am (LDFLAGS): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 3c36169aa59750ab58384b9676e2d08d465aac0e..3aa91ff942820ff548e0a18a4207713667a94636 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2002-01-17  Raja R Harinath  <harinath@cs.umn.edu>
+
+       Simplify Makefiles. 
+       <URL: http://bugzilla.gnome.org/show_bug.cgi?id=68969>
+       * gdk/Makefile.am: Remove use of automake conditionals to pick
+       library to build.
+       * gtk/Makefile.am: Likewise.
+       
+       * gdk/Makefile.am (LDFLAGS): Use $(libdir), not @prefix@/lib.
+       * gtk/Makefile.am (LDFLAGS): Likewise.
+
 Thu Jan 17 20:13:14 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtknotebook.c (gtk_notebook_redraw_tabs): Fix

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 3c36169aa59750ab58384b9676e2d08d465aac0e..3aa91ff942820ff548e0a18a4207713667a94636 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,14 @@
+2002-01-17  Raja R Harinath  <harinath@cs.umn.edu>
+
+       Simplify Makefiles. 
+       <URL: http://bugzilla.gnome.org/show_bug.cgi?id=68969>
+       * gdk/Makefile.am: Remove use of automake conditionals to pick
+       library to build.
+       * gtk/Makefile.am: Likewise.
+       
+       * gdk/Makefile.am (LDFLAGS): Use $(libdir), not @prefix@/lib.
+       * gtk/Makefile.am (LDFLAGS): Likewise.
+
 Thu Jan 17 20:13:14 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtknotebook.c (gtk_notebook_redraw_tabs): Fix

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 3c36169aa59750ab58384b9676e2d08d465aac0e..3aa91ff942820ff548e0a18a4207713667a94636 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,14 @@
+2002-01-17  Raja R Harinath  <harinath@cs.umn.edu>
+
+       Simplify Makefiles. 
+       <URL: http://bugzilla.gnome.org/show_bug.cgi?id=68969>
+       * gdk/Makefile.am: Remove use of automake conditionals to pick
+       library to build.
+       * gtk/Makefile.am: Likewise.
+       
+       * gdk/Makefile.am (LDFLAGS): Use $(libdir), not @prefix@/lib.
+       * gtk/Makefile.am (LDFLAGS): Likewise.
+
 Thu Jan 17 20:13:14 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtknotebook.c (gtk_notebook_redraw_tabs): Fix

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 3c36169aa59750ab58384b9676e2d08d465aac0e..3aa91ff942820ff548e0a18a4207713667a94636 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,14 @@
+2002-01-17  Raja R Harinath  <harinath@cs.umn.edu>
+
+       Simplify Makefiles. 
+       <URL: http://bugzilla.gnome.org/show_bug.cgi?id=68969>
+       * gdk/Makefile.am: Remove use of automake conditionals to pick
+       library to build.
+       * gtk/Makefile.am: Likewise.
+       
+       * gdk/Makefile.am (LDFLAGS): Use $(libdir), not @prefix@/lib.
+       * gtk/Makefile.am (LDFLAGS): Likewise.
+
 Thu Jan 17 20:13:14 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtknotebook.c (gtk_notebook_redraw_tabs): Fix

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 3c36169aa59750ab58384b9676e2d08d465aac0e..3aa91ff942820ff548e0a18a4207713667a94636 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,14 @@
+2002-01-17  Raja R Harinath  <harinath@cs.umn.edu>
+
+       Simplify Makefiles. 
+       <URL: http://bugzilla.gnome.org/show_bug.cgi?id=68969>
+       * gdk/Makefile.am: Remove use of automake conditionals to pick
+       library to build.
+       * gtk/Makefile.am: Likewise.
+       
+       * gdk/Makefile.am (LDFLAGS): Use $(libdir), not @prefix@/lib.
+       * gtk/Makefile.am (LDFLAGS): Likewise.
+
 Thu Jan 17 20:13:14 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtknotebook.c (gtk_notebook_redraw_tabs): Fix

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 3c36169aa59750ab58384b9676e2d08d465aac0e..3aa91ff942820ff548e0a18a4207713667a94636 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,14 @@
+2002-01-17  Raja R Harinath  <harinath@cs.umn.edu>
+
+       Simplify Makefiles. 
+       <URL: http://bugzilla.gnome.org/show_bug.cgi?id=68969>
+       * gdk/Makefile.am: Remove use of automake conditionals to pick
+       library to build.
+       * gtk/Makefile.am: Likewise.
+       
+       * gdk/Makefile.am (LDFLAGS): Use $(libdir), not @prefix@/lib.
+       * gtk/Makefile.am (LDFLAGS): Likewise.
+
 Thu Jan 17 20:13:14 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtknotebook.c (gtk_notebook_redraw_tabs): Fix

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 3c36169aa59750ab58384b9676e2d08d465aac0e..3aa91ff942820ff548e0a18a4207713667a94636 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,14 @@
+2002-01-17  Raja R Harinath  <harinath@cs.umn.edu>
+
+       Simplify Makefiles. 
+       <URL: http://bugzilla.gnome.org/show_bug.cgi?id=68969>
+       * gdk/Makefile.am: Remove use of automake conditionals to pick
+       library to build.
+       * gtk/Makefile.am: Likewise.
+       
+       * gdk/Makefile.am (LDFLAGS): Use $(libdir), not @prefix@/lib.
+       * gtk/Makefile.am (LDFLAGS): Likewise.
+
 Thu Jan 17 20:13:14 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtknotebook.c (gtk_notebook_redraw_tabs): Fix

diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index c2683587c68157553ddea3a221f50b84faac5ea4..3cdb3d8ed9f70db5157d3088f732db0901854b10 100644 (file)
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -70,7 +70,7 @@ endif
 LDFLAGS = @STRIP_BEGIN@                                        \
        -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)    \
        -export-dynamic                                         \
-       -rpath @prefix@/lib                                     \
+       -rpath $(libdir)                                        \
        $(no_undefined)                                         \
        @LIBTOOL_EXPORT_OPTIONS@                                \
        $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-1.3.la         \
@@ -147,41 +147,20 @@ gdk_c_sources = @STRIP_BEGIN@     \
 #
 # setup GDK sources and their dependancies
 #
-extra = @gdktargetlib@
 
-if USE_X11
-libgdk_x11_includedir = $(includedir)/gtk-2.0/gdk
+gdkincludedir = $(includedir)/gtk-2.0/gdk
+gdkinclude_HEADERS = $(gdk_headers)
 
-libgdk_x11_1_3_la_LIBADD = \
-       $(gtarget)/libgdk-$(gtarget).la 
-
-libgdk_x11_include_HEADERS = $(gdk_headers)
 libgdk_x11_1_3_la_SOURCES = $(gdk_c_sources) gdkenumtypes.c
-endif
-
-if USE_LINUX_FB
-libgdk_linux_fb_includedir = $(includedir)/gtk-2.0/gdk
-
-libgdk_linux_fb_1_3_la_LIBADD = \
-       $(gtarget)/libgdk-$(gtarget).la 
-
-libgdk_linux_fb_include_HEADERS = $(gdk_headers)
 libgdk_linux_fb_1_3_la_SOURCES = $(gdk_c_sources) gdkenumtypes.c
-endif
-
-if USE_WIN32
-libgdk_win32_includedir = $(includedir)/gtk-2.0/gdk
-
-libgdk_win32_1_3_la_LIBADD = \
-       $(gtarget)/libgdk-$(gtarget).la $(wintab_lib) $(ie55uuid_lib)
-
-libgdk_win32_include_HEADERS = $(gdk_headers)
 libgdk_win32_1_3_la_SOURCES = $(gdk_c_sources) gdkenumtypes.c
 
-endif
+libgdk_x11_1_3_la_LIBADD = x11/libgdk-x11.la   
+libgdk_linux_fb_1_3_la_LIBADD = linux-fb/libgdk-linux-fb.la    
+libgdk_win32_1_3_la_LIBADD = \
+       win32/libgdk-win32.la $(wintab_lib) $(ie55uuid_lib)
 
-# now define the real one to workaround automake's mishandling
-lib_LTLIBRARIES = $(extra)
+lib_LTLIBRARIES = $(gdktargetlib)
 
 EXTRA_LTLIBRARIES = libgdk-x11-1.3.la libgdk-linux-fb-1.3.la libgdk-win32-1.3.la
 

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index eb741ae2d1ed094747afa9dd52f298f7fbd64594..a1a5985957f724c217d4b3fc34260a33a2741e48 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -67,12 +67,12 @@ libgtkincludedir = $(includedir)/gtk-2.0/gtk
 LDFLAGS = @STRIP_BEGIN@ \
        -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)    \
        -export-dynamic                                         \
-       -rpath @prefix@/lib                                     \
+       -rpath $(libdir)                                        \
        $(no_undefined)                                         \
        @LIBTOOL_EXPORT_OPTIONS@                                \
        $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-1.3.la         \
        $(top_builddir)/gdk/@gdktargetlib@                      \
-       $(libgtk_win32_1_3_la_ldflags)                          \
+       $(libgtk_target_ldflags)                                \
        @GTK_DEP_LIBS@                                          \
 @STRIP_END@
 
@@ -400,12 +400,10 @@ gtk_c_sources = @STRIP_BEGIN@   \
        xembed.h                \
 @STRIP_END@
 
-if USE_X11
 gtk_plug_c_sources = @STRIP_BEGIN@   \
        gtkplug.c               \
        gtksocket.c             \
 @STRIP_END@
-endif
 
 # we use our own built_sources variable rules to avoid automake's
 # BUILT_SOURCES oddities
@@ -447,8 +445,6 @@ gtk_extra_sources = @STRIP_BEGIN@ \
 #
 # setup GTK+ sources and their dependancies
 #
-gtk_target_headers = $(gtk_public_h_sources) $(gtk_built_public_sources) gtkversion.h
-gtk_target_sources = $(gtk_c_sources) $(gtk_plug_c_sources)
 MAINTAINERCLEANFILES = $(gtk_built_sources)
 EXTRA_HEADERS =
 EXTRA_DIST = $(gtk_private_h_sources) $(gtk_extra_sources)
@@ -460,12 +456,18 @@ EXTRA_DIST += $(gtk_built_sources)
 # setup autogeneration dependancies
 gen_sources = xgen-gdef xgen-gtbh xgen-gtbvc xgen-gtbic xgen-gtbec xgen-gmh xgen-gmc xgen-gmlh xgen-gmlc
 CLEANFILES = $(gen_sources)
+
+## automake 1.5 supports this without the horrible 'oldest-source-stamp' 
+## hack below
+#BUILT_SOURCES = $(gtk_built_sources)
+
 Makefile: oldest-source-stamp  # oh boy, does automake SUCK!
 oldest-source-stamp: $(gtk_built_sources)
 $(OBJECTS): oldest-source-stamp  ${gtk_built_public_sources} # this is our oldest file, used for implicit auto-generation deps
+
 # initial creation of the real stamp-* files
 gtk.defs gtkmarshalers.h gtktypebuiltins.h:          # never add deps here
-       test -f "$(srcdir)/$@" || touch $(srcdir)/$@
+       test -f "$(srcdir)/$(@F)" || touch $(srcdir)/$(@F)
 # normal autogeneration rules
 # all autogenerated files need to be generated in the srcdir,
 # so old versions get remade and are not confused with newer
@@ -562,26 +564,20 @@ $(srcdir)/gtktypebuiltins_evals.c: @REBUILD@ $(gtk_public_h_sources)
 
 
 # target platform:
-lib_ltlibraries = @gtktargetlib@
-# now define the real one to workaround automake's mishandling
-lib_LTLIBRARIES = $(lib_ltlibraries)
-if USE_X11
-libgtk_x11_includedir = $(includedir)/gtk-2.0/gtk
-libgtk_x11_include_HEADERS = $(gtk_target_headers)
-libgtk_x11_1_3_la_SOURCES = $(gtk_target_sources)
-endif
-if USE_LINUX_FB
-libgtk_linux_fb_includedir = $(includedir)/gtk-2.0/gtk
-libgtk_linux_fb_include_HEADERS = $(gtk_target_headers)
-libgtk_linux_fb_1_3_la_SOURCES = $(gtk_target_sources)
-endif
-if USE_WIN32
-libgtk_win32_includedir = $(includedir)/gtk-2.0/gtk
-libgtk_win32_include_HEADERS = $(gtk_target_headers)
-libgtk_win32_1_3_la_SOURCES = $(gtk_target_sources)
+lib_LTLIBRARIES = $(gtktargetlib)
+
+gtkincludedir = $(includedir)/gtk-2.0/gtk
+gtkinclude_HEADERS = $(gtk_public_h_sources) $(gtk_built_public_sources) gtkversion.h
+
+libgtk_x11_1_3_la_SOURCES = $(gtk_c_sources) $(gtk_plug_c_sources)
+libgtk_linux_fb_1_3_la_SOURCES = $(gtk_c_sources)
+libgtk_win32_1_3_la_SOURCES = $(gtk_c_sources)
+
 libgtk_win32_1_3_la_LIBADD = $(gtk_win32res_lo)
 libgtk_win32_1_3_la_DEPENDENCIES = $(gtk_def)
-libgtk_win32_1_3_la_ldflags = $(gtk_win32_symbols) -lwsock32
+
+if USE_WIN32
+libgtk_target_ldflags = $(gtk_win32_symbols) -lwsock32
 endif
 EXTRA_LTLIBRARIES = libgtk-x11-1.3.la libgtk-linux-fb-1.3.la libgtk-win32-1.3.la
 
@@ -594,13 +590,14 @@ install-data-local:  install-ms-lib install-libtool-import-lib
 
 uninstall-local: uninstall-ms-lib uninstall-libtool-import-lib
 
-DEPS = @gtktargetlib@ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-1.3.la $(top_builddir)/gdk/@gdktargetlib@
+DEPS = $(gtktargetlib) $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-1.3.la $(top_builddir)/gdk/$(gdktargetlib)
+
 TEST_DEPS = $(DEPS) gtk.immodules
 
 LDADDS = @STRIP_BEGIN@ \
-       @gtktargetlib@                                  \
+       $(gtktargetlib)                                 \
        $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-1.3.la \
-       $(top_builddir)/gdk/@gdktargetlib@              \
+       $(top_builddir)/gdk/$(gdktargetlib)             \
 @STRIP_END@
 
 #